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

Change-Id: I796e3817adaefac26def3e24e86a01e4bb9d55da