Merge "Add missing liblog dependency" am: 9200a9aab7 am: cb092999cb
am: f68051a6be

Change-Id: I412248e299c26325a1992b58f4edeec83fdbfe0f