Merge "Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc."