Merge "Add USB audio dynamic channel mask to Nexus 10" into lmp-dev