Merge "Fix issue 2876124." into gingerbread
tree: eadcbb991b13055cdee86dc3b482b8e8dce098d1
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/