Merge "Support for storing OAT files in app directory"