Merge "Remove MediaPlayer2" am: a63468a847 am: 038672258e
am: ae324f0114

Change-Id: I5de6784004ab284f4704c576822ee08393f3f120