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

Change-Id: I4e5ba9793a9efe6d59a403b7b7416a8959514cad