Merge "Revert "Remove gBn/sConstructorMap from headers."" am: f033404b7e
am: 8c79de352f

Change-Id: I333c0ed8d8c48f5bb39b89bd74ebac761b9d3031