am a9c9d6ab: Merge "Unload oat files"

* commit 'a9c9d6abf5a37588f4eb1de7d3a12042a9fb3f81':
  Unload oat files