track modified android_build with master patches for master updates

Change-Id: I638e8ed966e27dee9d731445e0b2c858cd605e1b