Merge "JVMTI: Remove incorrect Android.mk statements" am: 7017f64dff am: 8b3fc42639
am: 42af782f65

Change-Id: Ib96a9790d573a5fb0fd31738e074e3c9f535c903