am 6a5fc54f: am a825aa13: Merge "Allow proto builds to pass in java proto params."

* commit '6a5fc54fe9904214a7df1d34c9d48ad0310d867e':
  Allow proto builds to pass in java proto params.