Merge "Add missing liblog dependency" am: 9200a9aab7
am: cb092999cb

Change-Id: I286fa20555573dafdc0351a8db47192730f21977