am 7c40768a: am 3821622f: Merge "Rework the generation of host java libraries."

* commit '7c40768ada93613b739fb007f4af70a8e0a45dbb':
  Rework the generation of host java libraries.