Merge "add odm partition to ld.config.legacy" am: cc06663c04 am: 6ba4207461
am: 61860a37aa

Change-Id: I06c52549ab1b316f6bb1854d9b2a71fbdbbabe36