[automerger skipped] Update symlinks that were broken when we ran git filter-branch am: 7db7aa7e27
am: 93f9c5f673 -s ours
am skip reason: SHA1 93f9c5f673 skipped by user tavila

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