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

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