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

Change-Id: I304f5728fc729868fb463c92fc4ae8175c562df9
tree: 139fcc253744292ce6508e6fcdf4bfd3ae4cd26e
  1. msm8974/
  2. msm8996/
  3. msm8998/
  4. Android.mk
  5. CleanSpec.mk