Merge "Add CtsShimPrebuilt" into nyc-dev am: 85c33f500a
am: e536d704e5

* commit 'e536d704e52d584f7aa23f88ba200cf8771af386':
  Add CtsShimPrebuilt

Change-Id: Ic589ccba5f3e7bd6a28d3e8d84ed98c5cf699d1b