am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"

* commit '9a3f3b9db63e7e109a417c0959b8bc589ab70e04':
  stagefright amrwbenc: Simplify the definition of static_vo