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

* commit '6748d16b7c94d2302eeda96b83ce4070c6b36220':
  Unload oat files