Merge "aaudio: minor cleanup in clock model" into rvc-dev