Merge "Don't pass in oat file name to NativeLocationInImage"