Revert "Remove gBn/sConstructorMap." am: c6ce6e50a7
am: 69c51d7243

Change-Id: I1a1ab82bac49bf52d7984aac237f4cdfb996b4ad