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

Change-Id: Icc49f11520e54b73ea55e628af0a7f79ac2f402c