support multiple files and fix logcat smippets for launcher_protoutil

plus some code cleanup

Change-Id: I09b4a6aedbb1251a65d379464d830da694d38a38
1 file changed