Merge "liblog: tests: liblog.__security property failure" am: 2a54ae97eb
am: 1bc4b39bef

Change-Id: I8d5c15b9cfe005336fef456f865b83d2525f514e