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

* commit '0872a010659d20633f07f4ef54cf61f8e4b6e030':
  More flexibility to keep/remove R.class in static Java library