Fix layoutlib build

Two changes merged at the same time ended up being incompatible.
This fixes the build by re-introducing some deleted code.

Flag: NONE host-only change
Bug: N/A
Test: layoutlib tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c06e94274f8f6632c9b52227aeea94e205cdde5b)
Merged-In: Ib0873cc47523c21e55482676a2e5c0c6e0672a39
Change-Id: Ib0873cc47523c21e55482676a2e5c0c6e0672a39