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

Change-Id: Ie71368e7b4571d209d8c3a824bbf1a8c738f56a8