am cb616cf7: Merge "Automatically add Java resources carried by static Java libraries." into jb-mr1-dev

* commit 'cb616cf73671028708c22bf76e47af515d12f485':
  Automatically add Java resources carried by static Java libraries.