am b2ee64ed: Merge "Fix regression with hardware layers." into honeycomb

* commit 'b2ee64edffe3dfe7316baa435566f777e657d9a0':
  Fix regression with hardware layers.