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

Change-Id: Ib61666ec7103dab2e40d6e68e8a49fcf4c46a9b2