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

Change-Id: I17ad0b71f001a3db89656743dc49680578e98a1a