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

Change-Id: Id1855c02db66842f4733e671f942d33e58c7cdd1