Merge "RRO tests: adapt tests to split apks"