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

Change-Id: I4f3363f8345597f4514828597cce9bbd6b0d1658