Merge "Revert "Add shim app for CTS testing"" into nyc-dev
am: 878775fd75

* commit '878775fd750d7164bd0920b4b94b59e0edab8ed3':
  Revert "Add shim app for CTS testing"

Change-Id: Ie5df8c8ea8785b8562866522f6d13e54b5ce52d5