Merge "Fix SELinuxDomainTest testSdcarddDomain()"