Clean up AnalysisConfigBuilder/MappingConfigBuilder

* Remove globals, provide those from the caller
* Remove static functions, they're redundant

Change-Id: Id55d336b0dd171f0d2e89cf396273a5edf41cbbf