Merge commit 'a3763b85d4d95a0316df9718bb0d132cf458374d' * commit 'a3763b85d4d95a0316df9718bb0d132cf458374d': Dump media recorder PID in dumpsys media.player, and fix minor bugs.
Merge commit 'a3763b85d4d95a0316df9718bb0d132cf458374d' * commit 'a3763b85d4d95a0316df9718bb0d132cf458374d': Dump media recorder PID in dumpsys media.player, and fix minor bugs.