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

Change-Id: I3651fb3be0178b888c5ada3d3754fb379b55a847
2 files changed