am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit 'e481e713f24c83a3347fd83580d07252d589ec3b':
  Include Shapes in LayoutLib. [DO NOT MERGE]