Merge "Camera2: update captureIntent and flash mode tag spec"