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