Merge "Fix liblog#__security failure"
am: 7887dd8567

Change-Id: I40443a10f9e59bc8099e4204ffe3ca808c5a1c0b