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

Change-Id: Ic2235f14a1191d7bf72914b31368a4a9f3819dc3