Merge "Make HD and Dev packages, Not WVGA"