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

* commit '225a2901af2fb08e1cc47103565bc35eedb45752':
  Allocate buffers locally in systems without SurfaceFlinger