Merge "Add transfer mode support to ColorDrawable" into oc-dev am: eedceb5721
am: a17c58ff59

Change-Id: Ied2dd786e7a31f53c685b920e119bd127f9d9f82