Revert^3 "Disable check that no oat libraries are loaded.""" am: 8b5af2c1fb
am: 36654ce4d3

Change-Id: If781ff30db18b823c01362e103fd0834f41d0ed0