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

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