Manually merge changes from giant AOSP topic

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