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

Change-Id: I24d6db3717d74962dd7aee4f4d1a6b23065fe95f