am 4eeb1047: Merge 13212f83 from gingerbread-plus-aosp

* commit '4eeb10470ffafe8c508027f363ac66b58da5bf00':
  Fix issue 2988031.
tree: 2e8a393fe19a343c8aa470ae33f5cc0f64dc44ad
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/