Merge "Verify the class loader context when loading oat files" am: 774beea7 am: 07756bf2 am: 296c5c65 am: eaf31eea Change-Id: Ia07fff2c39f49726d13b2c30229376e73c9a2e6d