Merge "Remove useless code in aacenc"
am: 6f2e6b2524

Change-Id: I975bc95e8d708ef98dc866851b72a7f10ceb8c9b