Merge "Camera2: CaptureRequest: Use common code for Surface unparcel" into nyc-mr1-dev