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

Change-Id: I73ffb54ffb7eb57403c1fedc01f3b9488ba195a4