Revert "Remove gBn/sConstructorMap."
am: c6ce6e50a7

Change-Id: I0f99282ae9675a0f969d34355a5d6e474b0c1cb5