Merge "Add missing liblog dependency" am: 902ce06e01
am: 02f2747322

Change-Id: Id5c75abeae7b6a11ed087f2316e464ae253c2f7f