Merge "Synchronize channel masks in AudioFormat with system/audio.h"