Merge "libmediaplayerservice: Check for a possible divide by 0" am: caa0b29253
am: c6a37161e1

Change-Id: Ie2e7119611734e72d6982c4f709e6bace9357085