Merge "Provide a macro to define a map along with type safe accessors"
am: edac9a3cc3

Change-Id: Ib6e1710736395205d69ea64dc4720e53bc96996a