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

Change-Id: I046c4012c34cf774db9febe6adfacd9cd431a8c7