am 2c4ce96e: am 801f558c: For issue #2651381, allow library prelinking.

Merge commit '2c4ce96e814bbde60dba2a33df3a06dcf3734ca6' into kraken

* commit '2c4ce96e814bbde60dba2a33df3a06dcf3734ca6':
  For issue #2651381, allow library prelinking.