Merge "adb unittest: make test_unicode_paths stricter"