Merge commit 'b67cf562081c6b7cb3ae1432238537647b9fc011' of sso://googleplex-android/platform/frameworks/layoutlib into HEAD
Change-Id: I1f99a8c561ca3dc7e15fe5f18106cf293b33b0af