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

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