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

Change-Id: Ia3933416f651d737beaae34cab4efd35e9e6156d