Merge "libmediaplayerservice: fix deadlock in dump()"