Merge changes from topic "b113052379-cp-from-pi-dev-p2"

* changes:
  Camera: Documentation update to remove physicalIds
  Camera: Documentation updates for calibration and distortion correction
  Fix NdkImage.h includes
  Restore __ANDROID_API__ guards for camera/media headers
  Remove __INTRODUCED_IN from a typedef