[automerger skipped] Merge changes from topic "am-afec395a-dee0-4bb8-a6d1-e1a546a9e5cc" into oc-dev am: 27c62d3683  -s ours am: f3724f0c53  -s ours
am: 259f413df4  -s ours

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