Fix CTS build

Change-Id: I9144b2978b21f706f02e32e5c899dd69dea92975
6 files changed