Android n mr1 preview 1
Merge "Add depedencies that allow error prone to compile source." am: bda9492f34
am: 5095ad9929

* commit '5095ad9929cebe9bf8e6c71fa77415cdb42f804b':
  Add depedencies that allow error prone to compile source.

Change-Id: I7f68fa2f347c64a911c869e1a648d23e19a13913