Merging constraint layout 1.1 Bug: N/A Test: Done in another repository Change-Id: I53b124f88dae4b0e1c1b3f6eef93d7c0d95db4d0