[automerger skipped] Update symlinks that were broken when we ran git filter-branch am: 7db7aa7e27 am: 93f9c5f673 -s ours
am: 8db320d3a3

Change-Id: I74ba0a7693eaecd7d8f272f70c7e40162f7301b2
tree: 001c725e283bb4b73785e9da5ae91a771b78ba2a
  1. include/
  2. Android.bp
  3. memtrack.cpp
  4. memtrack_test.cpp
  5. OWNERS