Merge "Fix b/2943524: On-device linking the rs_cl." into honeycomb