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

Change-Id: I89eee2bd4858fcd02aa5c56791fc7f0b981abb96