Merge Java installer steps into one layer