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

Change-Id: I9b6d00eafd4223a8ce82f0d2da89aec720f354a0