am e23620e6: Merge "Build LayoutLib with Java 6" into lmp-preview-dev

* commit 'e23620e684ae73558e42a51f93004c8de07ba8d5':
  Build LayoutLib with Java 6