Merge "Update support library modules to contain min_sdk_version"