am 4ae3c7e8: am 6748d16b: am a9c9d6ab: Merge "Unload oat files"

* commit '4ae3c7e80380bb64f731d7448404bcaf6abc5d72':
  Unload oat files