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

* commit '85c33f500aa2ef7c70c1644617e7439b97f22a79':
  Add CtsShimPrebuilt

Change-Id: I3448eef2b50c83b2c058a9e8a5ba5b848ff84c18