Merge "Verify the class loader context when loading oat files" am: 774beea7dd am: 07756bf24b am: 296c5c6560
am: eaf31eeab1

Change-Id: Ia07fff2c39f49726d13b2c30229376e73c9a2e6d