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

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