Merge \"Merge \\\"CtsShim: Support building with tapas\\\" into nyc-dev am:...
Merge \"Merge \\\"CtsShim: Support building with tapas\\\" into nyc-dev am: c47168d5 am: 094a8439\" into nyc-mr1-dev-plus-aosp
am: fc450e94
Change-Id: I89046e0d14da035dd137544f7a13fca22b7f4867