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

Change-Id: I972a20d69f508513c194ab60375fc9ccec87fcb5