Merge "synchronized audio beat detection: DO NOT MERGE" into ics-aah