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