fix arm build
Merge pull request #298 from joshuawarner32/fix-arm

fix arm build
fix heapdump=true build
Merge pull request #299 from dicej/heapdump

fix heapdump=true build