Fixup compose layouts.

Match jb specs.

Change-Id: I44235ddf8d7a9980651843f137b16a3e0e6397a7
7 files changed