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

* commit '22d8bd9b93223634e2d0bf5ec1cbddd888e96136':
  Fix libdl build warnings, turn on -Werror.