Revert "Revert "Add shim app for CTS testing""
am: 98ffa937bf

* commit '98ffa937bf6d7acc6a1964c7157c906e1a86203c':
  Revert "Revert "Add shim app for CTS testing""

Change-Id: Ib75f8e062cd4ca8e9958c218fa0da9da2323ccd5