MFC r273929:r273929 (by jmmv): MFV: Import atf-0.21.
Import atf-0.20.This is a MFC of r261897 and r262000 and should allow all of the atftests to pass.