am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."

* commit '5d1db8b4335d554bfd7e028496f0305b78b0676b':
  Allow proto builds to pass in java proto params.