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

Change-Id: I707c46e7c3de643c4de548bf5f0a85966192cd50