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