am 7b2fc930: Merge "SurfaceFlinger: Limit to 4k Layers" into mnc-dev

* commit '7b2fc930077b1e6ca5946cae6834902318209474':
  SurfaceFlinger: Limit to 4k Layers