Merge cherrypicks of [2446180] into oc-release

Change-Id: I7820f049527f60e2d4d62131c78a36709ebd9ebc
tree: 82a18cd7afb7fb49bfd2f977b7b72ee4268d28cc
  1. msm8084/
  2. msm8226/
  3. msm8909/
  4. msm8960/
  5. msm8994/
  6. msm8996/
  7. msm8998/
  8. Android.mk