Merge "Remove upside-down portrait orientation." into froyo