Merge "Fix odm output directory for devices w/o vendor partition" am: 46cfab96d8 am: eec39a95f3
am: a620ad1ff1

Change-Id: Ie029f0bcb2227cb43beeabb550aea21a19803a5b