Merge "Add USB MIC in case of AUDIO_SOURCE_CAMCORDER" am: 69b9593594
am: 671b05bf3c

Change-Id: I117dbe53c6ab331b3cb41777c3247ecb3b5b68b2