Merge "Camera: add missing stdint header" am: 402bedf403 am: af64986cb7
am: d27836d324

Change-Id: Ib2d21e95d6ac50f925a1f9b2acad79ec43c32c8c