Merge "Add shim app for CTS testing" into nyc-dev
am: 6d0c367a64

* commit '6d0c367a64b91cdf8dc6bc25605bff7b13f35a35':
  Add shim app for CTS testing

Change-Id: Ic6342cd60478364533514b576ccc86b6db7ab695