simplify Dockerfile FROM clause

Change-Id: I4b3db457741d72634568faed1ec229067673ca76