Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2