Fixup Android tests build rules