am 89fca351: Merge "Make nested hardware layers work again" into honeycomb

* commit '89fca351702e3ec54c2748e2e2676ec1b2fbe9dc':
  Make nested hardware layers work again