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

Change-Id: I1ce292fbf498a75eb14331ea0c242bc2b7968992