Merge "Replace old audio time conversion macros and functions"