Merge "[automerger skipped] Merge "Start using shared libraries class loader." am: e7753e084f am: 4879460f35 am: c64eef6211  -s ours"