Fix baseline constraints in ConstraintLayout

Change-Id: I44fa1d733df7ef000f950aa6efa25d7959b2412e
12 files changed