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

Change-Id: I2992316e7c9f63b64892ff5e8de6a85a903617cb