Merge "Change build config of aac from Android.mk to Android.bp"