Merge "Fix CTS build on AOSP/master"