Merge changes from topic 'update_csl'

* changes:
  Import support libs from build 4023242
  Update constraint layout from update_current.py