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

Change-Id: Icde14ff603ca8c9e5481be84c59d168335213d92