Merge "Add missing liblog dependency" am: c4dd0c3b83 am: abd9a76f5e am: 924fd128fc
am: db459af95a

Change-Id: If039f91c7e2bf38fee5796be915e53acd9fcb7a6