Merge "Consider prebuilt vendor.img as having vendor partition." am: 8a7b0dee6b am: 4a5a1e15a1
am: e45026effa

Change-Id: I50ed26b5bc532d37ddc3d30a915c183974ad34fa