Merge "Fix some unused DT_ warnings"