Change-Id: I926531e9ad4a7b98e04e23cac3837794f7c89449
Also a few generic fixes in the layoutlib itself to support this. Change-Id: Ie3f24c9056bd3cc72f39f8a4f2c0861be15bff55