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

* commit '51aab8775ab86990abef411d00f5686e41022eee':
  Allow proto builds to pass in java proto params.