Merge "Make Layoutlib compile on Java 6."