Merge \"Disable constant state sharing for VectorDrawable\" into nyc-dev
am: f66bdf9b57

Change-Id: I05799d473194db7e9a1a42871f988e81d41baf61