Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 2fc0f4e484 am: dc8ddb2da5 am: 6248e3fbaf
am: 1048094109

Change-Id: Ibe4df8e59e7e644dc86d949c83e0577c16165833