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

Change-Id: I70f7b31f7e4e017f1358528d13e5bfe5e2ff7242