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

Change-Id: I7fed34988f078c6136bb0c028b7cc14b63ca31f6