Merge "Make CtsShim*Prebuilt be available to the test APEXes"