Merge "adb: relax serial matching rules." am: bf889742f2
am: 668c38516f

* commit '668c38516fae82829c0f5e0a4091fb6cb5d389cc':
  adb: relax serial matching rules.