merge in klp-release (no-op)
tree: 31304fcfc216920efc422287ea375d73d73efaa2
  1. msm8960/
  2. msm8974/
  3. msm8x26/
  4. Android.mk