Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: ff39d325a6

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