Merge "Add missing liblog dependency" am: b32a59e797 am: f12ea76ef3
am: 2851a53929

Change-Id: I6ae1d8283de37feec8c2f53af018b1ff470a2786