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

Change-Id: Ib0edaeb21ecc1f28cda0e8c0985e0966968fd8d2