Merge "Support multichannel sounds in bootanim" into nyc-mr1-dev