Merge commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3' * commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3': ADT/Layoutlib: properly handle stroke information.
Merge commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3' * commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3': ADT/Layoutlib: properly handle stroke information.