Merge "aaudio: cleanup code that reads timing model"