Merge "Support multichannel sounds in bootanim" into nyc-mr1-dev
am: 5b1702e554

Change-Id: I978fbf7171c05a7ebf1d149fb763f5ba6dfdccee