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