Merge "Bug 4599730 Get audio channel count on MediaPlayer"