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

Change-Id: Id998b894fc49763ff86ec81d8c403963be53e74b