Merge "Use Android Native encoder instead of qcom hardware aac encoder"