Merge "Revert "AIDL: use typed Map""