am fcbc0b7f: am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""

* commit 'fcbc0b7f0b8f654414c97699b36e6356cbb4bb08':
  Revert "Allow proto builds to pass in java proto params."