Revert "Rename ConstraintLayout artifacts"

This reverts commit aab148a1d759bc2b68761c9c55c200d987864d6d.

Change-Id: Ibc321f4754910d62fc4add1aaea349ded1ae0834
18 files changed