Merge changes Ifc28fb51,I8371a3c4 into oc-mr1-dev am: a5bf099a9e
am: fa6d012d88

Change-Id: Ib15c1ce7a372e254090322474a818ea57c6c60d8
tree: 7162f8bdf0a64b2e1a33afa1bb4aa0907d278b1a
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk