We make the Dockerfile logic consistent across all of the platforms
in prep for further cleanup later in the series.  No logic changes
are introduced to the resulting outputs, only the manner in which
they are generated.

Change-Id: Iebda8b3bf5211fd829b2f5ea8fa3af15bedd6544
Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>