am fa63e306: Merge "Fix the CTS build now that core is gone"
am fa63e306: Merge "Fix the CTS build now that core is gone"

* commit 'fa63e30605ff723cfef493540553dabdf0440339':
  Fix the CTS build now that core is gone

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build