[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: c374c6d4f4 -s ours

am skip reason: subject contains skip directive

Change-Id: I6d3b4b9bed9492af19281d32f528b0ba5992b6fa
tree: e50e610b781a8f1373d5cac4d4d7b393a02b2bec
  1. Android.bp
  2. OWNERS
  3. include/
  4. memtrack.cpp
  5. memtrack_test.cpp