Merge "Build LayoutLib tests with Java 6" into lmp-dev