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

Change-Id: Ic46ceb9fce64a7db977013254622bc24b91f6f3e