[automerger skipped]Revert "Remove gBn/sConstructorMap from headers." am: 2da958e782  -s ours
am: 86e1547967  -s ours

Change-Id: I6aa6d0af1864b2f3002cade743bae5f05a984f92