Merge b5caa310cdac8165a1d4147c2135da6829d19e73 on remote branch

Change-Id: Icd16e6136cd5a17d7ae9c712956413e9c33b57d0
tree: 95275f93395e5ebac02641e8a4731d40c94f0555
  1. libaac/
  2. Android.mk