Merge "Remove the workaround for Eigen sigmoid_op"
am: ede6582296

Change-Id: I3982701e8b37ae85e05b1336e454aad5a7d4062e