Merge "Correctly implement the CLEAR xfermode."