Merge "[automerger skipped] Merge "Remove MediaPlayer2" am: 2e51cefc7e am: 068d3c7ec3 am: 41d2d5417f am: c190b7cdca -s ours am skip reason: change_id I1550c14f3a0967910809cc2415d10f62c967bd44 with SHA1 a9a802f976 is in history"