Merge "Remove logwrapper calls to fix SELinux denials." into jb-mr2-dev