This version's config.{guess,sub} knows about android
(cherry picked from commit e69c9040)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>