Merge \\"CtsShim: Support building with tapas\\" into nyc-dev am: c47168d592
am: 222a6998b7

Change-Id: I6444d115d5dd17f92a335e734ab16819bd89dc81