Merge "Revert "Set min_sdk_version to be part of mainline modules""