Merge cherrypicks of [3536650, 3536562, 3536563, 3536481, 3535874, 3536495, 3536496, 3536632, 3536633, 3536434, 3535900] into oc-m2-release

Change-Id: I860e68be896364dfd1aaf9be69dac6ad7c540579
tree: b5daa1354a7cec3427c84b853baa57bd110660a8
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk