Merge "fix int vs. pointer mismatch in return statement. Add missing include header for compilation on x86 target."