Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I6eb564aa898cc619627f61b2b334d3845439e544
tree: 0525a31ae05b46b580f350a806d3bd7a22dbd4af
  1. msm8998/
  2. Android.mk