bbc3811662
Conflicts:
include/hip/nvcc_detail/hip_runtime_api.h
Change-Id: I990a7d008da9e8dcc68250cebbc8ee6e723c7e01
[ROCm/hip commit: 72c722c3d6]