[automerger skipped] Merge "Remove MediaPlayer2" am: a63468a847 am: 038672258e am: ae324f0114
am: a731a79541 -s ours
am skip reason: change_id Ie2a94aace8286a1fad4e9f59232f761bcab0cc5e with SHA1 a523204f3e is in history

Change-Id: I5996192e216f09fc79ade08c814a598cf1a49435