Merge "jni: move security interfaces to private" am: 07bc1ee77d
am: 82df72dc1f

Change-Id: I63c71141a74cdfe55080492353f1bb2cc4e5e696