Revert "Remove f54test from Android build since it is currently not compatible"

This reverts commit a15fa80ba498286ef78a89410903c43801b95699.
Fix Android build errors in f54test