Merge "cargo2android: reorder TEST_MAPPING statements"