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

Change-Id: I98ea4b3c203abd31996ed12d667da3921dfb6771