Move call to ExportedToMake() out of LoadHook am: faa21a688e am: 1daf5bbe4a

Change-Id: Iad11f7002d708036c43459d9555fa3940b081a14