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