Minor cleanup of the pwd.h ndk patch