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

Change-Id: Ieac0e26d9017b275d7a7997f750cccfa206062e9