Merge "LDPI layout changes" into gingerbread