Added android build support to test infrastructure