am 2cc48c71: am 20f04df8: Merge "build: always include host java files in platform.zip" into klp-volantis-dev

* commit '2cc48c7138a36d53ce8dfe585099a119d19cbe10':
  build: always include host java files in platform.zip