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

Change-Id: Iee9aca0d47f5cd80d0c3d872ea6325cca3d66963