Merge "[automerger skipped] Merge "Start using shared libraries class loader." am: e7753e08 am: 4879460f am: c64eef62 -s ours"