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

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