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

* commit '5742010b8522cc059b3d1473e0afc378dc04dce2':
  Add CtsShimPrebuilt

Change-Id: Ic3c32ba9f99abc89680240cf45d7d4de820d6499