Merge "Add missing liblog dependency" am: b32a59e797
am: f12ea76ef3

Change-Id: I45aaf4f8f9ff72ce0f5ea37f750616abdd3fc138