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

Change-Id: I5dddb4aeffa111dfda64e335d7baf7758a1740ee