Merge "Export libkeystore_aidl to PDK."