Merge "package-modules: use && instead of ; between copy commands" am: e0e20079c2
am: 8843039368

Change-Id: I651caea23c32671a5ff06d65a858db9ed63ff009