Merge "Move AudioPlayer to test commands" am: 4426ce8d95 am: 4520fef512 am: 8429516eed
am: f94b6d6d81

Change-Id: I96ba323a3400613395fd7fb21cb5869256af238c