Merge "surfaceflinger: fix layer count" into oc-dev am: 39cf8b4944
am: 317b493667

Change-Id: Ibc092a475c8733a7a70359516e869a83573c6f5c