Merge "[keystore2] Fix binder import path"