Merge "adb unittest: make test_unicode_paths stricter" am: 95f81b0afa am: bfe99de308
am: 922baec545

* commit '922baec545775f83a100899602a6c4d35eb08ae8':
  adb unittest: make test_unicode_paths stricter