Add optional extra modules into npm package, rather than create lots of
different npm pacakges

Change-Id: I380ca4fe2316e17e1166e2c273c942208223ddd9