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

am skip reason: subject contains skip directive

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