Merge "Android scripts: add --verbose, fix missing 'source android_setup'" into master-skia

https://skia.googlesource.com/skia/+/7ae68a8f8d5b26cb945dbf8147eb343a59c22b40

Change-Id: Ibec1dfb67ee27af49b90f514732760537473e6b9