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

Change-Id: Iac5021d897f0c9f83886426663cd1428ca4a9c54