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

Change-Id: I570df166245cecace59955fac8b667d99167d591