More fixes
More fixes

Summary:
When testing the code, a couple of issues arised:
 - we need to have different name for last layer than the preprocessed model, otherwise a shape assertion is created
 - preprocess_noaugmentation still needs to do a crop for images larger than 227x227, otherwise things fail.

Reviewed By: viswanathgs

Differential Revision: D4442700

fbshipit-source-id: 05f54e7f17c266280f5ba5bb57af1721fe30df12

pietern/caffe2,caffe2/caffe2,bwasti/caffe2,xzturn/caffe2,xzturn/caffe2,davinwang/caffe2,Yangqing/caffe2,pietern/caffe2,davinwang/caffe2,bwasti/caffe2,sf-wind/caffe2,xzturn/caffe2,bwasti/caffe2,davinwang/caffe2,sf-wind/caffe2,pietern/caffe2,Yangqing/caffe2,Yangqing/caffe2,davinwang/caffe2,Yangqing/caffe2,bwasti/caffe2,sf-wind/caffe2,davinwang/caffe2,Yangqing/caffe2,xzturn/caffe2,bwasti/caffe2,sf-wind/caffe2,pietern/caffe2,sf-wind/caffe2,xzturn/caffe2,pietern/caffe2