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

* commit '885f91f7c9f3e50967622fb6ac813af484a4addf':
  Build LayoutLib tests with Java 6