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

Change-Id: I3cfa83467819317ca39eaa798f0e55eaec8d62b1