Merge "Revert use of vector assets for check/radio < API 21" into nyc-dev