Merge "Move camera config props to camera_config_prop" am: 98316f23ab

Change-Id: Id5361ce2d2192eafcfb967cfc07facdcdfd590b7