Merge "Allocate buffers locally in systems without SurfaceFlinger"
am: afcf267cbd

* commit 'afcf267cbd86316cd98c96bc82400479c965d8d6':
  Allocate buffers locally in systems without SurfaceFlinger