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

Change-Id: Iff76ef4ef129b4e1e76786998a0cbf9acec08f3b