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

Change-Id: I24afe7a30c21fe76a3cccd30b97587a940c9967e