DO NOT MERGE Redo import vector drawables
am: a6d8523a3b  -s ours

Change-Id: I412b3ae16418a984e4cb7d9520a56425a04aa53b