Merge ee92225643bbc0ac1d8b69e9d295a87f9cbeb605 on remote branch

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