Merge "AAudio: Improve buffer size calculations" into main