Adding support for both android test examples