Merge changes I3341e5d5,I4df0b83d am: 22b83deacf

Original change: https://android-review.googlesource.com/c/platform/system/memory/libdmabufheap/+/1495002

Change-Id: I3fa7243a925a8cc8a2a63174cb3e2d3c91371150
tree: 3462e9d75ec8b7e2c8e88faed6d90d29a7e6fe97
  1. include/
  2. tests/
  3. Android.bp
  4. BufferAllocator.cpp
  5. BufferAllocatorWrapper.cpp