Merge "AAudio: do not use enum types, use sized types"