Merge "Replace test music with something easier to hear" into oc-mr1-dev
am: 8ffa1fe8b0

Change-Id: I3e0524545042481ead8df211eeec22ff32069bf8