Merge "Fix liblog#__security failure"