Merge branch 'upstream-master' into master
* aosp/upstream-master:
Update catch2 testing framework: v1.12.2 -> v2.13.3
clang-format: define C++ standard to improve formatting
Refresh ABI cross check test files
Drop unneccessary includes of abg-cxx-compat.h
Remove <unordered_set> usages from abg_compat
Remove <unordered_map> usages from abg_compat
Remove <memory> usages from abg_compat
Remove <functional> usages from abg_compat
Drop C++03 compatibility layer
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Idd46e71c075d5aa5b74cdb14b7d702ac835ce712
