Merge "Merge "Consider prebuilt vendor.img as having vendor partition." into oc-dr1-dev am: 0bf9b22866  -s ours am: 86dc28223e  -s ours" into oc-mr1-dev-plus-aosp
am: 7745b9e504  -s ours

Change-Id: I227a8a677909f9111f1e0abba37eeafeb7868d97