Make nested hardware layers work again

Change-Id: I97bde694ec1b712a1e010c8137919e6d64af3148
2 files changed