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