Merge "Add missing liblog dependency"
am: b32a59e797

Change-Id: I8ed998f6342914164f89ce8584bca61b8daa4244