Rename files for building JS image

In preparation of rebasing all patches so that the Compatible image is the
normal one and the JS image is based on the Compatible image.

This commit keeps the generated images unchanged.
Rebase patches

Apply proposed patches first, followed by patches for the compatible
image. Reverse patches that record differences between compatible and JS
image, so that the compatible image becomes default and the JS image the
special case.

This commit also keeps the generated images unchanged.