add forwarder fixes and remove unneccesary ndk fixes
Merge pull request #11 from jchen10/master

add forwarder fixes and remove unneccesary ndk fixes