add composer.json

Change-Id: I1b81bf34e5c0aef5952210ec75cc232a8ab5989f
Merge remote-tracking branch 'upstream/master'