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

Change-Id: Ief11c5006eb76d505c061d3eb2a4676d1aec9d27