Merge changes I1dd7d8e6,I0a745eb0 into oc-mr1-dev am: 4a724a3b25
am: 2d82a1e164

Change-Id: I8320efc7f43db13f1a266ecea45fef9991493f49
tree: 49abb3b1f562b2309b648d922219eee550972510
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk