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

Change-Id: If27a7e4154dabbeffd2b11ee2b788c9e30b3d9a7