Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev am: 2385e2184a am: f3cdbe2254
am: f593ca4d3d

* commit 'f593ca4d3d15d1c3f57d2d54f9cb250c23f4f90e':
  Revert "Switch LayoutLib to Java 8"

Change-Id: I899ace3ef0e6856320141de0471d88a7eab78e7a