Merge "Add missing liblog dependency"
am: 1a35848b34

Change-Id: I4801c57c6385588fd745bea34caccb7398009ccc