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

Change-Id: I2b444c36225693f0755c1b6854c86c17203a9945