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

Change-Id: I0e931caf04062e44e1a8b3ed3075ef1c5382fea2