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

Change-Id: I5373a4e935db09eb7a98f55cb5266f475b3dcd01