Merge "Add compat checking of the merged APIs"