Merge bcd82b75a71b6735cc05e912c074389d6603b993 on remote branch

Change-Id: I49496830372d85bf1eefe795601f817415eeaa3c
tree: f71e233c230fb661f6af0aa5c05e6760a7f243fb
  1. include/
  2. tests/
  3. Android.bp
  4. BufferAllocator.cpp
  5. BufferAllocatorWrapper.cpp