Merge 'master' into 'amd-master'

Change-Id: I79fc1a5d5692ae9783b9e26c7adecc6c707da977


[ROCm/clr commit: 81d46ce8ac]

projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h

@@ -57,6 +57,12 @@ THE SOFTWARE.
 
 #if __HCC_OR_HIP_CLANG__
 
+#if __HIP__
+#if !defined(__align__)
+#define __align__(x) __attribute__((aligned(x)))
+#endif
+#endif
+
 #define CUDA_SUCCESS hipSuccess
 
 #include <hip/hip_runtime_api.h>