Merge "Add AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT." into pi-dev
am: d5c9702411

Change-Id: Ib8778acbce8c8daf1897c1cde35ce6dbfa4fad6d