am a46d5e4b: am 63750cb6: am 4eb88f88: Merge "Support for storing OAT files in app directory"

* commit 'a46d5e4b9a598330e2a79395dbd201ab88aded00':
  Support for storing OAT files in app directory