Merge "AAPT leave <gradient> alone for VDC" into oc-mr1-dev am: 81831f89ce
am: fa1d67a6f8

Change-Id: I967e540cd9f40db3f957f188bcf557bc6a95cb9b