am a33bb164: am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2

* commit 'a33bb164b2ac792d5bba76ba198fb052197fd520':
  DO NOT MERGE Correctly implement the CLEAR xfermode.