Merge "Patching around channel-index mask problem in AudioRecord. DO NOT MERGE" into pie-cts-dev