Merge "Correctly pass force-abi to instrumental test." into lmp-dev