am 8bdd408b: am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev

* commit '8bdd408bace65f854eac0972f2fb636306aae854':
  Build LayoutLib tests with Java 6