Refactor and clean up on blend_mask6

Change-Id: Ie9188471e7dc07ab9c95b22f258b1662e895c533
9 files changed