Merge "Revert "Allocate Google heap for JPEG input buffer"" into oc-mr1-dev am: 7f0af74040
am: 4f1c7b04a2

Change-Id: Iafbb7b91ef655d23cbf05f557d1689b082a78206
tree: 7d9cfd381b51c462bef142f00647e8301fd6f3da
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk