am 12159420: Merge "Fix libdl build warnings, turn on -Werror."

* commit '12159420e1654f6896993eda39aea8b5e5586f80':
  Fix libdl build warnings, turn on -Werror.