Merge "Set initial audio device for AudioTrack and AudioRecord" into oc-dr1-dev
am: 66feec9ff3

Change-Id: I415f753f94ccc8efbd5dcd6e918cfbef392f16d9