Merge "Fix gyp files so that gyp_to_Android.mk succeeds" into master-skia

https://skia.googlesource.com/skia/+/7869bbff26b75a34ff8f56c9dfdaa98476adb6cb

Change-Id: Ie523dd07585cca736cb930a53b455d3a230a0ef4