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

Change-Id: I09f2316707ea335b8622cdd7c8ddabe5511fd45c