Merge "Use preview_sdk_int for version code checks"