Merge changes I7389829a,I4f3f91e8 into nyc-dev
am: a0a4e0e

* commit 'a0a4e0ee2c4e4c2b186c180ba0970931e24c1d66':
  vulkan: pass VK_LAYER_FUNCTION_DATA_CALLBACK to layers
  vulkan: update vk_layer_interface.h

Change-Id: Id069248575f0542c1469639310cf0f9d88a8da48