Fix checkbuild breakage in stage-aosp-master am: dc8ee518f7 am: d19c592b13 am: 95a47ac0fe
am: 3984012d9a

Change-Id: I14ddbbbf6a881f0c4f08dc99b3e4f7a4e0717e18