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

Change-Id: Ic57ec8debe84102c55b63e2bdfb94a41da86d71c