am 122f14fa: am 94364b91: surfaceflinger: don\'t check HWComposer numLayers unless one exists

Merge commit '122f14fa7d0ac4d7a62757f596431286f6ab037f'

* commit '122f14fa7d0ac4d7a62757f596431286f6ab037f':
  surfaceflinger: don't check HWComposer numLayers unless one exists