Merge "Add missing liblog dependency" am: 1a35848b34
am: 598ae6f8cb

Change-Id: I5e820972ed8fbf76b71af0a32d543b1579094ad8