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

Change-Id: Ia9648388ba527d3314fe8d28a390726ca5de14ef