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

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