Merge "Remove old binder interface entry for keystore2"