Merge 67db5894f763deb468f7cdbb637b964a97b2e883 on remote branch

Change-Id: Ied885a505a9f02a704ecfd1d1f5f5f8fcf1ffa1b
tree: 2812155ed23ea13706cac83e2f1290b75391bfc3
  1. include/
  2. Android.bp
  3. memtrack.cpp
  4. memtrack_test.cpp
  5. OWNERS