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

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