Merge "Don't allow ptrace on keystore"