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

* commit 'ea374096511f92206c264f3f1eb0551a05a34cd5':
  stagefright amrwbenc: Simplify the definition of static_vo
tree: 23733fada37ed7053fd8ef220205932af5ebaec0
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/