Merge "ANativeWindow_setBuffersGeometry now returns proper error codes"