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

Change-Id: I5218a62d8ee9b4463df09e4487ff72c477ca2b46