Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 3c229a39f3

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