[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 800d172aab -s ours am: 4e9ceb22eb

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