Import atf-0.20.

This is a MFC of r261897 and r262000 and should allow all of the atf
tests to pass.