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

* commit 'bfe99de30823070c73edf7e304087b799b4b941c':
  adb unittest: make test_unicode_paths stricter