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

* commit '5532365a289c8c2e8cb827c07058d72eb38f2e1c':
  Don't pass in oat file name to NativeLocationInImage