Manually merge changes from giant AOSP topic

Change-Id: I964109a006b9a2e80e1b48615eea89d822277657
tree: e595eb0b8764db8d5473f117458ab00631d961da
  1. camera/