Merge \\"libvulkan: Fix for -Wcast-calling-convention\\" into stage-aosp-master am: 99465d6a4a
am: c67f2b6aa4

Change-Id: I3a41a5ab5d7ab303d905dd948e763c93eac4f51d