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

Change-Id: I3db41bcf74e41b622e7a77a0fcfedfb4d78b1b46