am 5f85bb49: Merge "support multiple files and fix logcat smippets for launcher_protoutil" into jb-ub-now-kermit

* commit '5f85bb4977d95a1a8148ce28d534586fb1dff45d':
  support multiple files and fix logcat smippets for launcher_protoutil