Merge "Add missing liblog dependency" am: c4dd0c3b83 am: abd9a76f5e
am: 924fd128fc

Change-Id: I4ec9bf4e9842e9ca9353532e93b322991db685ca