Merge "Fix root level Android.mk to now point to the correct nanobench makefile" into master-skia

https://skia.googlesource.com/skia/+/ed20c9b

Change-Id: I14529d6f8adc22df0ec856a236566241dcca1d28