am 969b3ae4: am 39740e1e: Merge "Fix b/2943524: On-device linking the rs_cl." into honeycomb

* commit '969b3ae440d9bef1a7a0f3c642ac9c81b37e2c32':
  Fix b/2943524: On-device linking the rs_cl.