Merge "Pass targetSdkVersion specifier for SELinux labeling"
am: 4516240b47

Change-Id: Ic61c4dc30f075d01a85d8b60cfe4ae1de773aa09