Reorder documentation about building images

[mbhave]

Section 4.31.1 is about Building Docker Images and 4.31.2 talks about Buildpacks. The buildpacks section should also go under Building Docker Images since it is another way to build them. The layering bit is also in 4.31.1 but it applies to the buildpacks too.