Merge "[pm] derive correct abi override during prepare package"