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

Change-Id: Ie8fe37a78ce14157c5c66cec99b69175cc2dce79