Merge "Tracking DexFile rename of defineClass to defineClassNative"