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

Change-Id: I0260dec12bff1313521d604130099b5546a42944