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

Change-Id: I08006648ded070d3f10243f02882e2bdeab8c741