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

Change-Id: Idcf829b3ccae7644612890918a38f4636749398b