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

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