Merge "Revert "Remove liblog from libcutils as a whole static lib"" am: d4446ccce8
am: 3e5bb6dc6e

Change-Id: I6ec33c2aefa86f088701340b73205efab82a422d