Merge "Add ability to use support library for vector drawables" into nyc-mr1-dev