am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"

* commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9':
  stagefright aacenc: Add missing newlines at the end of files