Merge "android: Upgrade catch2 to v2.7.2" am: 6461e4174a am: 47286e0e8e
am: b9a38f6db9

Change-Id: I542b2e907a9e975df1ae31305206c8a36f9d84aa