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

Change-Id: If6bb6ff7147e221b85d3750eeddbd1870d464ed8