Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 99e44773ba am: e665010297 am: 4a03375cc7
am: 8e1c7e1455

Change-Id: I47e60813bbc3c2467a219611edfa7800e37dca0d