Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2
tree: 963cae09a9a8feefe6bc2e0a7317a48ec1580988
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/