Merge "Pass targetSdkVersion specifier for SELinux labeling"