Merge "Check for getDmaVersion instead of s_grdma" am: fc866232d8
am: 8f76db8dde

Change-Id: I1aaf5ee1322999fc2b2954bd3ef1ecf91d8b15d3