Snap for 4792730 from ce7edab44293352805827f2c0a99f7d112532cab to qt-release

Change-Id: Ia200e9cb35c7390a056d7839b81075b759c5aac6
tree: 6abe6701a25898b173e9685ce6fe624e37b87514
  1. msm8998/
  2. Android.mk