Merge "Add missing liblog dependency" am: 6a7c807d65 am: 247fe92207 am: be037cba4c
am: 01a1375cef

Change-Id: I3c86c770ac9477024a2fd70f60f1bba26553d80d