Weather: Update to PS18

AICPfy:
Actually use those dimens in layout

Change-Id: Ib1ca827b18afe949eb41e605d721f6f2ddce4f57
weather: Update to PS20

Change-Id: I4009b93a5e67a89ccf91321047a3fc82cccc3bfc
weather: PS21

Change-Id: I9c0bd343de247786f48c6872254c94a43f795495
alittle fixup to remove my changes to weather