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

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