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

* commit '2385e2184a68318a582f075bcd483baa35c776b4':
  Revert "Switch LayoutLib to Java 8"

Change-Id: I1fac72ca4535c3878f4aafddaf26c1ee9695c3cf