refs #35, #37 Fix build issue, add x86 and armeabi-v7 support