[NEW TYPE INFERENCE] Fix potential perf timeout issue
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=79731375
Remove unused proto definition
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=79766964