Merge 173e79e6caef197fea7c57655dfac38fa12019de on remote branch

Change-Id: Ia2f23b98f5336169c32f66baf21b806cb1d83333
tree: 19b20196adc49108d52a13f509c11a91c4c49adb
  1. libaac/
  2. Android.mk