Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231  -s ours
am: 91ec9a6fd3  -s ours

Change-Id: I075a2bf350184ade7a96cb1e4846d9459695a630