Merge 37bc164b63dd01b205683c785af866178eff8fa8 on remote branch

Change-Id: I47e28170ecd0e04f0c4bce206fe7655fb940cc59
tree: 1958a3c973ff573627f525a97934638eb9509fba
  1. include/
  2. tests/
  3. Android.bp
  4. BufferAllocator.cpp
  5. BufferAllocatorWrapper.cpp