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

Change-Id: I0ee4801c31a63b8e617adb053a773456814b65ff