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

Change-Id: Id634286bbc659fe5af7f08c9e3de4c114d32ce95