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

Change-Id: I682637551ad4b4be00b3f4e076c961dc583e9e0b
tree: 4ba97625a85753b41d99b98071eaae1ddd5b4d69
  1. msm8998/
  2. Android.mk