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

Change-Id: Icd0b77b032179c8e8ce5c6009848e23916c990d5