Merge "adb: relax serial matching rules."
am: b4709c2cfd

* commit 'b4709c2cfd2a31b032d25c6b9eaa495c3092aeaa':
  adb: relax serial matching rules.