[third_party/aac] Merge updates from android.

Created by

git checkout -b upstream
git pull https://android.googlesource.com/platform/external/aac
git checkout master
git merge --no-ff upstream

Change-Id: Ib86b0258653f76a5263fa678edf237e77111ca46