am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7

* commit 'f7f1280e0c71d64098efb42b58a922d056164b5e':
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers
tree: 016522738d7ea9e3ff254c2b4a48c6a50c8913e2
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/