android scaffold
android
Merge remote-tracking branch 'origin/master' into guac