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

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