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

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

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