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

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

Change-Id: I2b97993e7f6803e0352d1734db74891bee0b75d7