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

Change-Id: I31102bb5a450f286518075fed6dd91fc190ef441