Renamed 'layout-sw640dp' to 'layout-w640dp'