Revert r182465 and add lsan-common library to makefile-based build