Merge "Revert^2 "[keystore2] Fix binder import path""