Merge "liblog: clean up SafetyNet unit tests" am: 78b5f01051 am: 4fee4601a5 am: d44050ad17
am: 5295ade28e

Change-Id: I75d68767c178cf65a68f0aac55b9495bc6067e51