ART: Conditionally remove loaded-oat-count check am: 3383f9c812
am: 68f1bd4c62

Change-Id: I3862a1149ddaf1654ec65fb5c0e8c9f96c0e3649