am bf8fd42a: Merge "Do not attempt to unregister null oat files"

* commit 'bf8fd42a6390d5694fe387b9bc876fc510645810':
  Do not attempt to unregister null oat files