Merge "Require liblog for libbase in all configurations" am: f633b62b63 am: 391f68a4e5 am: 42b044a3c6

Change-Id: I6fdc85451143fad7ee9ab7d4e36098143ea0a563