Merge "Fix abi-detection for 32-bit system apps" into mnc-dev