Fix same_struct_two_ids amber test

Fix same_struct_two_ids amber test

Due to 1.4 has removed some features and the test mentioned below
requires SPIR-V 1.4 the test fails with InternalError reporting:

    2nd operand of Decorate: operand BufferBlock(3) requires SPIR-V
    version 1.3 or earlier.

Replace BufferBlock with Block and use StorageBuffer instead of Uniform.

Updates:
 * dEQP-VK.spirv_assembly.instruction.spirv1p4.opcopylogical.same_struct_two_ids

Components: Framework

VK-GL-CTS issue: 1817

Change-Id: Ia80923fc6f717729712017904773c015c17168ec
(cherry picked from commit facb3d6815f678c7d25d25919fca7e33cea931df)