Add support for non-PIE targets < API16 & include two binaries