Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev