[DO NOT MERGE] Revert "Fix broken make target launcher_protoutil_lib Bug:26406415"
am: 8363faf9a8  -s ours

* commit '8363faf9a885933aca2ced9bb1c6f9aa4a43c9f7':
  [DO NOT MERGE] Revert "Fix broken make target launcher_protoutil_lib Bug:26406415"