Merge 13212f83 from gingerbread-plus-aosp

Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
tree: 699025e929ec01e6188363e025a53e02d569ad10
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/