Merge "aaudio: cleaned up PlayerBase implementation" into oc-mr1-dev am: a39b3ba3ad
am: 0b97f851d0

Change-Id: I3b56f7eb66c201371de9af495fad8bf3b8310300