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

Change-Id: I2405d6f4ac7dd3936e22f989c8a245391f1859d4