Merge "Fix CSLs with alpha attribute in AppCompat again" into nyc-dev