am 031898df: am 3d8b7f4d: Merge "Support for storing OAT files in app directory"

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