Merge "copybit: Fix mismatch between HAL and MDP formats."