Merge "Add missing liblog dependency"
am: 6a7c807d65

Change-Id: Ia590e4b12de01da9a288cda8dfe730a82c319648