Merge "ADT/Layoutlib: properly handle stroke information." into eclair