am ccd0338c: am e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.

Merge commit 'ccd0338ce637e62c483a727de04236aa05f989aa'

* commit 'ccd0338ce637e62c483a727de04236aa05f989aa':
  Fix windows make: layoutlib_api moved to sdk.git too.