Camera2: CaptureRequest: Use common code for Surface unparcel am: 48932bbf9f am: 89c90769c0
am: 74b9ba1ccd

Change-Id: I494a3075d492537e5b28fd0372908326189b4669