Specify swig version in filename

Change-Id: I2156fb7fbaabf64d3c97e502cb4b4c493dddef6b
Use json.dump instead of json.dumps

Change-Id: I8d2f90a9bfe7e739008fc69790f2c403c33b4bd4