am d5aef281: am a2267bf4: am 7598f145: Merge "Revert "Revert "Unload oat files"""

* commit 'd5aef281f221c7169c359de5f0a9f2d666598e60':
  Revert "Revert "Unload oat files""