Merge "adbd: Fix check against valid payload size"