Merge "camera2: Add parcel/unparcel for missing Surface field." into nyc-mr1-dev