Merge "Merge "Add CtsShimPrebuilt" into nyc-dev am: 85c33f500a am: e536d704e5" into nyc-mr1-dev-plus-aosp