Merge "Cargo2Android: add rdep tests to TEST_MAPPING"