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

Change-Id: I0bcaed331650bd7ac022d1f2d1bbea817c33b4e5