[automerger skipped] DO NOT MERGE SoftXAAC::getXAACStreamInfo never validates mNumChannels against MAX_CHANNEL_COUNT am: 003b0ca977
am: ee0ad4a3ea  -s ours

Change-Id: I3e77b5e2dc34aec82d5650841d562e6877f129bd