am cd0bd801: merge from open-source master

Merge commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923' into kraken

* commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923':
  Fix "make layoutlib" under Windows+Cygwin