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

Change-Id: I8e71e977fda657bb4600db305ba938cfc3d10de3