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

Change-Id: Ie1ff1ee3b7caa04972c59aa9c2ff8c14d35dbc03