am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2

* commit '95f397adb13aa69b15b53bb089078d4dbdb269f1':
  Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."