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

Change-Id: I8f447cc603277a4a238df8b787626d0d8e980f31