Merge "Convert vulkan to Android.bp" am: e421c0710f
am: 78bde35997

Change-Id: I2a90a2c075892d39085ba1984da053648e807c4c