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

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