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

* commit '20345bd81b866738f75c8b47a940b941b894cde1':
  Update SELinux JNI to use helpers