Merge "Update makefiles for logging." am: 2fe5762cae am: 007e4f5516
am: 2a523150df

Change-Id: I93446fa1ff57c08d1a408d577862f1843796c9e6