Merge "createSurface getpid() first parameter was removed"