Merge "Don\'t pass in oat file name to NativeLocationInImage" am: 5532365a28
am: 378f1bf1c2

* commit '378f1bf1c2c27a32f137f4e78c4267ee28b2ecbc':
  Don't pass in oat file name to NativeLocationInImage