Changes to support building in NativeClient-SDK repo.

BUG=none

Review URL: https://codereview.chromium.org/12116002