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

Change-Id: I10c37feec35c4f2a339d8bf92b55c32c9be34a28