Convert from MapMaker to CacheBuilder.  Change mostly from Stewart McCulloch mcculls@gmail.com modulo internal build issues, a few tweaks and dealing with some test flakage in a functional test.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=52590552
Update script for api diffs.
Added updated 4.0 api diffs.
Merge remote-tracking branch 'upstream/master'
Patch for issue 760 has been accepted upstream