deeplearning4j/deeplearning4j

Next round of SameDiff/ND4J/TF import fixes
#6959

AlexDBlack wants to merge ab_fixes into master

Compare on GitHub

We do not currently have an analysis of these two commits