Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev