Merge "Add 5.1.2, 5.1.4, 7.1.2, 7.1.4 output channel masks" into pi-dev