Merge "Consider prebuilt vendor.img as having vendor partition." into oc-mr1-dev