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

Change-Id: I17d9c00e1e604a4be462637a39e3004826cc6631