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