Merge "Add liblog as a dependency where libbase is used" am: 5576f58f1b am: cbbfc3c898

Change-Id: I0cb734b02f5c86bc15638572d1ea251685d75997