Merge "Add missing liblog dependency" am: 6a7c807d65 am: 247fe92207
am: be037cba4c

Change-Id: Ibcb0d57f3a88d8d34c7d992f1552ea4b2cdf8a15