Merge "Add versioning to app compat framework"