Merge "MediaPlayerService: Remove 64 bit compilation warnings" into nyc-dev