Merge "Revert "Export libkeystore_aidl to PDK.""