Merge "Add missing liblog dependency"
am: 9200a9aab7

Change-Id: Iadef81cd47f5a2f250f9209c9f74574a9092ba17