Merge "[docker] Renamed hw layer to hardware"