Merge "vdl: Fix Javascript type generation bugs."