am d9520336: am 20345bd8: Merge "Update SELinux JNI to use helpers"

* commit 'd9520336a74560cdd983c9480b2e6a317dd8a193':
  Update SELinux JNI to use helpers