resolve merge conflicts of a45b1d6f3 to master

Test: compile
Bug: 30465923
Change-Id: I648855539df3cfa176c6ecac19b6a562ba6feaf7
tree: 71bcc7fac42d649692bb4260b9e9b8330776c431
  1. Android.bp
  2. include/
  3. memtrack.cpp
  4. memtrack_test.c