Port make_black fix for YUVA from master.