Merge "liblog: test: liblog.__security miscalculation" am: 3ed85748e1
am: 725526774b

Change-Id: I9027d158e1af9cf270c3c297fcf5fa2dd11ea351