Merge "h/q/d: Add missing ASTC format"