Merge "add odm partition to ld.config.legacy"