Merge vk-gl-cts/vulkan-cts-1.3.0 into vk-gl-cts/vulkan-cts-1.3.1

Change-Id: Ib963ea274243454803090094d0ac61136ab8e998

diff --cc android/cts/master/src/vk-master-2019-03-01.txt
Simple merge

diff --cc android/cts/master/vk-master-2019-03-01/api.txt
Simple merge

diff --cc android/cts/master/vk-master/api.txt
Simple merge

diff --cc external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
index 4d28212,4515c02..40c324e
--- 1/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
--- 2/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
@@@ -314,12 -284,12 +314,12 @@@ void BaseAllocateTestInstance::createDe
  class AllocateFreeTestInstance : public BaseAllocateTestInstance
  {
  public:
 -                                              AllocateFreeTestInstance                (Context& context, const TestConfig config)
 -              : BaseAllocateTestInstance                      (context, config.useDeviceGroups)
 -              , m_config                              (config)
 -              , m_result                              (m_context.getTestContext().getLog())
 -              , m_memoryTypeIndex             (0)
 -              , m_memoryLimits                (tcu::getMemoryLimits(context.getTestContext().getPlatform()))
 +      AllocateFreeTestInstance        (Context& context, const TestConfig config)
 +              : BaseAllocateTestInstance              (context, config.allocationMode)
 +              , m_config                                              (config)
 +              , m_result                                              (m_context.getTestContext().getLog())
 +              , m_memoryTypeIndex                             (0)
-                 , m_memoryLimits                (getMemoryLimits(context.getTestContext().getPlatform().getVulkanPlatform()))
++                , m_memoryLimits                (tcu::getMemoryLimits(context.getTestContext().getPlatform()))
        {
                DE_ASSERT(!!m_config.memorySize != !!m_config.memoryPercentage);
        }

diff --cc external/vulkancts/mustpass/master/vk-default/api.txt
Simple merge