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

Change-Id: I1b158f5328c581738fd5c0ca1e397c2dfece5560