am dc5f1db8: am 43b89c8e: Merge "Allocate buffers on the heap"

* commit 'dc5f1db8e05df56c087fef0c90e876c94bb62b73':
  Allocate buffers on the heap