Merge "Add depedencies that allow error prone to compile source." am: bda9492f34 am: 5095ad9929 am: 949206634e
am: 18e4eccff3

* commit '18e4eccff3babfffafc79b949482bc10e749731e':
  Add depedencies that allow error prone to compile source.

Change-Id: Ie9142a5a23f1ec13ddf8e74792387d4b8c3ac121