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

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