Update android_build

Change-Id: I70351e4110bbfae9a61165ce8268bab83afe54c5