Merge "Do not attempt to unregister null oat files"