Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2