Merge "Fall back to normal split if imgdiff fails when splitting large apks"