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