Revert "Provide a macro to define a map along with type safe accessors" am: 4f3298db93
am: f0b194b015

Change-Id: Ib3739b80afb6536f2b64559135b93dd6dffe986f