Merge "Propagate error codes from createSurface" into pi-dev
am: a912b6ec28

Change-Id: Ia3887fb7ebd35c8aa64878f8f95767b694410a3b