Merge "Consider prebuilt vendor.img as having vendor partition." into oc-mr1-dev
am: 6bec81a924  -s ours

Change-Id: I23ed3bb0cb5c9b7f5e56b515dfb8a3de010ce9b3