Merge "Fix abi detection for system apks" into mnc-dev