Merge "fix android framework build for nanobench" into master-skia

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

Change-Id: I34b48d13a399cbc16a9b4aaefc6510edf6e7f24e