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

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