Merge 0793358500d67c58403995dec74b2d3de9e3338c on remote branch

Change-Id: I20dd9083246bac4801b9ef303c0f42939aa14f9c
tree: 7cce80e8e5423d4930a66b0cff33e83e1efe2f9b
  1. include/
  2. Android.bp
  3. memtrack.cpp
  4. memtrack_test.cpp
  5. OWNERS