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

Change-Id: If6d2231e486ba91398ff8bef8d4f118e57c3324d