[automerger skipped] Merge changes from topic "am-de30185d-edfc-49d5-b5e1-aa1bdb83d97a" into oc-dev am: f6bc541263  -s ours
am: 9d54deadfe  -s ours

Change-Id: I5c5b6e985062374998459273d68d612bf92f59b2
tree: 63df7a62773cb34f9697a7e409542cfd793f4412
  1. msm8974/
  2. msm8996/
  3. msm8998/
  4. sdm845/
  5. Android.mk
  6. CleanSpec.mk