Update Android Variant tests