DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 011636b08c

Change-Id: I15161c269ec5d68766e60f55a36482f95cfd0c77
tree: 587a3b49ca83cd9dc8c9c863b34cfbfeab118769
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS