am bff8cdfc: am 022885e2: Merge "Clean up all the lint cpplint can find in the dynamic linker."

* commit 'bff8cdfcece52f3fedaabb1fb498fdd7b4984f57':
  Clean up all the lint cpplint can find in the dynamic linker.