Fix CTS build

Revert "Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev"

This reverts commit c88194007596171b68624e08c055f796ed750b05, reversing
changes made to 65fbe1fcd153c5647f8d1e1a7443b3f04b7b25fd.
1 file changed