Merge "Fix bug 4319552 Use commonly defined channel mask values in native"