DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: a5efd51e5b

Change-Id: I554d6e07a925fb3d1731c80790bfe5f796b61a7d
tree: 0c0ecdf5b587c2a1c80cfed8d40c5aab3c0d7f46
  1. Android.bp
  2. src/