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

* commit '530093e1fd538debdfa06d8c04c8cd824912b1c7':
  Fix libdl build warnings, turn on -Werror.