Merge "libc_scudo: Set min_sdk_version to apex_inherit"