Merge "Fix the condition to use compact resource entries"

  // 2) the entries will be accessed on platforms U+, and

  // 3) all entry keys can be encoded in 16 bits

  bool UseCompactEntries(const ConfigDescription& config, std::vector<FlatEntry>* entries) const {

    return compact_entries_ &&

        (context_->GetMinSdkVersion() > SDK_TIRAMISU || config.sdkVersion > SDK_TIRAMISU) &&

    return compact_entries_ && context_->GetMinSdkVersion() > SDK_TIRAMISU &&

      std::none_of(entries->cbegin(), entries->cend(),

        [](const auto& e) { return e.entry_key >= std::numeric_limits<uint16_t>::max(); });

  }