Merge "AudioRecord keeps track of UID" into mnc-dev