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

Change-Id: I16f115c55ff1ee3784953e4089ffb3d948b6faf0