am 47deb15e: Merge "Remove MediaPlayerService::decode()"

* commit '47deb15e99cbf60e558027e074b7415c95637943':
  Remove MediaPlayerService::decode()