am 79204b98: Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb

* commit '79204b98d260d8f5e8419f5149b31b336424aec5':
  Part II of fixing b/2943524: On-device linking rs_core.