Merge "Change build config of aac from Android.mk to Android.bp"
am: 8334e4b410

Change-Id: I770984561bf97b52e50c83844f4037fccabfdedc