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

* commit '7e4c40875dcb07f80bb418f391702bfa6f7738bd':