Merge "Merge "Add ability to use support library for vector drawables" into nyc-mr1-dev am: f2d05819 am: 3860bcee am: ad453735" into nyc-mr2-dev-plus-aosp