Merge "Clean up hard-coded min_sdk_version/apex_available"