Merge "xhdpi" into froyo