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

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