issue #2905: Reverting TestCpp/Android.mk