Merge changes Ie30f0ca8,I59b4d4ce

* changes:
  Move Media 1.0 files in mainline back to framework
  Remove MediaSessionEngine.CallbackStub