am 8f067ca1: resolved conflicts for merge of 4cbee7d2 to lmp-mr1-dev-plus-aosp
am 8f067ca1: resolved conflicts for merge of 4cbee7d2 to lmp-mr1-dev-plus-aosp

* commit '8f067ca18d333bf03b7dc8a60c2b66b1faf0e5ac':
  Remove MALLOC_LEAK_CHECK references.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base