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

Change-Id: I4251acfd4d37b09041aedfdbf926da0d2e64ff67