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

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