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

Change-Id: I4a66d2bc35a0d4d47b0ffe838db2dcbada632dd1