Merge "Implement the Cross-Version ABI diff configuration"