Merge "Fix liblog#__security failure" into oc-dev
am: 210be3820f

Change-Id: I628d4b8630344dab6d417e351fab8f2038093813