am f2525aa9: am 885f91f7: am 820d90e2: am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev

* commit 'f2525aa9f8baa8662904ee1b027a0018460baf21':
  Build LayoutLib tests with Java 6