Merge "Update makefiles for logging."
am: 2fe5762cae

Change-Id: I2f85a37a4cb7178aecd48eb63ca6fa7e7d715917