Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""

This reverts commit 051c84bba3.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9

samples/0_Intro/square/Makefile

@@ -11,7 +11,7 @@ else
 	SOURCES=square.cpp
 endif
 
-all: square.out square.out.static
+all: square.out
 
 # Step
 square.cpp: square.cu
@@ -20,8 +20,5 @@ square.cpp: square.cu
 square.out: $(SOURCES)
 	$(HIPCC) $(CXXFLAGS) $(SOURCES) -o $@
 
-square.out.static: $(SOURCES)
-	$(HIPCC) -use-staticlib $(CXXFLAGS) $(SOURCES) -o $@
-
 clean:
-	rm -f *.o *.out *.out.static square.cpp
+	rm -f *.o *.out square.cpp