Merge commit '954374392bfb9ed9f3fb5950e581579cd2671b05' into HEAD

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