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

Change-Id: I2e1d3109dae69068a9b9b14751a42065e8d17902