Revert "Don't use QCOM HW AAC encoder"

This reverts commit bad215875d81ba752be571d716094e5b2825b516.

Change-Id: I341b5a846bb74c634f9a6dcd95b7ba69ca546a4b
Merge remote-tracking branch 'cm/cm-12.0' into HEAD