Merge "Logd: include app package name in selinux metadata"