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

Change-Id: I9831ba9702aae900a8ebbe51ca86ff81985b077f