Merge "base: delete abi compatibility shims."