am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit '3edba93fd9bff8e2b22486271e6e816e3b233ae9':
  stagefright aacenc/amrwbenc: Remove trailing whitespace