Merge changes I3341e5d5,I4df0b83d

* changes:
  libdmabufheap: Provide a way to better check that we have a valid name mapping
  libdmabufheap: Fix build issues with c-style cpp code using the wrapper header
tree: 3462e9d75ec8b7e2c8e88faed6d90d29a7e6fe97
  1. include/
  2. tests/
  3. Android.bp
  4. BufferAllocator.cpp
  5. BufferAllocatorWrapper.cpp