Merged with updated Facebook's hadoop-20 master. Compiles.