Merge "Tidy ups for AppCompat vector support" into nyc-support-24.1-dev