Merge "add support for constraint layout's DATA list" into nyc-dev
am: 64bd41ff7d

Change-Id: I93e87b680a6bba3d90de2ef4f8f16bc02afb33ab