Merge "Add transfer mode support to ShapeDrawable" into oc-dev
am: 498a44f33a

Change-Id: I09e0f8bbbd8b8ba0123eea3ae5958d453321007c