[automerger skipped] Merge changes from topic "am-23973cb8-6ed2-4797-9749-019d6251e3c6" into oc-dev am: bb411369f5  -s ours am: 0be491ae2b  -s ours
am: c705508576  -s ours

Change-Id: Ib2e7b79320225de19d0a1ff66fdb431117d8b538
tree: f9f5d2ba2ac1f7a47a884edb6b3940a9f4c3d6fa
  1. msm8974/
  2. msm8996/
  3. msm8998/
  4. Android.mk
  5. CleanSpec.mk