[automerger skipped] Merge "Remove more remnants of MediaPlayer2" am:...
[automerger skipped] Merge "Remove more remnants of MediaPlayer2" am: 0cbbcc6f am: f418196d am: 39f327e0
am: a5363d90 -s ours
am skip reason: change_id Iaa4d9e4205f78d4b4d465b4f128a28a419ff603b with SHA1 273fd369 is in history
Change-Id: I8094fcd0b8ec8b2eb54fe02e2965271cf7cae268