[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: 24738a20f5 -s ours am: 548050bd71 -s ours

am skip reason: Change-Id Ica54841cbc81b29c4b3bfa0b58f94a0f82de300b with SHA-1 7ba307cd34 is in history

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