Merge "Revert "[vulkan] Build vulkan.ranchu (goldfish)"" am: 1463e76871
am: ba56958504

Change-Id: I870a19b2301241d4b5dfc64b74fb319c9f64a3d9