[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: e6b849a6b9
am: 59deedc9c4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie97a31ce98b2ffd433c670c7a642586dbb3f4008
tree: 6a561f5379c73c4eb7ba64915284437755028320
  1. apps/
  2. build/
  3. util/
  4. .gitignore
  5. README