Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into...

Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e2 am: 24b2dba4 am: 7fa70522  -s ours am: 91ec9a6f  -s ours am: a9c1e43d am: 82bc8c45 am: 6f8e939c  -s ours am: f49ac6ef am: 5d7ca784 am: 36621068 am: f225daf8  -s ours am: 67fd8ff7 am: 2180a832 am: bef261cc am: 7a17981a
am: 5e86258d  -s ours

Change-Id: I5c1a79703b751cf83987c6490e96ccc7d0f3db7d