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

Change-Id: I6ac970adf51b0d5bdd2c4065aac47c56779b2efc