tree c5c1e7ab59f35d76bbe1d20cc2cd0695cded34c7
parent 4b771661e27493a87fa83fe19f463df9817ed743
parent 8024278b58bee89482c1d5754487dd218b27218a
author Tao Bao <tbao@google.com> 1479619098 +0000
committer android-build-merger <android-build-merger@google.com> 1479619098 +0000

update_verifier: Sync Android.mk with aosp-master. am: 5422d80961 am: ca64fa7bb9
am: 8024278b58

Change-Id: I1cf75d7b5dd2da532971feef94b2558db40404b4