Merge changes from topic 'selinux-targetSdkVersion' am: fb6783391e am: d16878f98c am: a245e8b1ba
am: e68f6fe401

Change-Id: I1c41631e19d8dc837c21f7748634f96d1ab0c994