Merge "Fix non-vendor.img configuration."