Small fixes of the bundling script

Change-Id: I7fb8229bfa927f2f560ae45c39e32db516897363
1 file changed