switch to master android_build

Change-Id: I337748223fe722fcb125435a5a8095600e4a5a2e