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

Change-Id: I731220c719cf29d94e11698906dfb7f049a90a55