Merge 'develop' into 'amd-staging'

Change-Id: I318ec499d446569cde139a3adef678ae305e89a5

samples/2_Cookbook/14_gpu_arch/gpuarch.cpp

@@ -19,6 +19,7 @@ THE SOFTWARE.
 
 #include "hip/hip_runtime.h"
 #include <iostream>
+#include "hip_helper.h"
 
 #define THREADS_PER_BLOCK   64
 #define BLOCKS_PER_GRID     4