Merge "Add missing liblog dependency" am: b32a59e797 am: f12ea76ef3 am: 2851a53929
am: 2bc204b65b

Change-Id: If8d2fde719a2f9985c8a9748d48503ab96e9c7bf