Merge "Pass targetSdkVersion specifier for SELinux labeling" am: 4516240b47 am: f8cefed995 am: 5493749d64
am: fa030e505d

Change-Id: Ie6b6bba24490f0ca2db738aa46d2bbc2c6f9387c