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

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