Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master
am: ad57e2ca2c

Change-Id: I5ad7c0763284e32952c9b7953e526ec2d8e1aed9