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