Merge "Allow recovery-dtbo in recovery.img to be signed"