Merge "Add missing liblog dependency"