Merge "libmediaplayerservice: Trace point addition"