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

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