Merge "avb: Remove use of malloc for disable verification"