Merge "Add missing liblog dependency" am: ac7c3e2801 am: 319408f97b
am: 7eaa57e398

Change-Id: Iadd620cbcb9b0a253e77a6c5fbec29ee7d9b732b