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

Change-Id: I16c8e041daad6f21dd80ec50db52ae488f1b91c5