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

Change-Id: I434956c50012f3e4662623ecd45a1573ae363f4e