Remove gBn/sConstructorMap from headers. am: 0288c9a89f
am: e3e65fee18

Change-Id: Ia993ef627e52d60e7acd7ce911ce3f1b104314c9