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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base