[automerger skipped] Provide a macro to define a map along with type safe accessors
am: 5fe026a927 -s ours
am skip reason: change_id Ib7a351ff876891a2296e32deebd0308ff9c7fcc8 with SHA1 6564b8eac4 is in history

Change-Id: Ib9c85744312a8602ccd693db9acb27f66e4dda78