am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"

* commit 'bf5c5e5b03fda1b6397e95fa621ed9b0649a5360':
  stagefright amrwbenc: Change keyword ordering