Merge "Port credstore to IdentityCredential AIDL."