Merge from open-source master

Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
tree: a017cf53f00999690df527f76a6e0ba16ff926c0
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/