Merge "AAPT leave <gradient> alone for VDC" into oc-mr1-dev