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

Change-Id: I29804a614eaad6875d4c53aea12f2c03ccca0130