Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791 am: 9897bd43a6 am: 8fd8bfdfbd  -s ours am: 748277a992  -s ours am: 71b3486ba6 am: f55cac801a
am: b209b64a87  -s ours

* commit 'b209b64a871f7180eaecf89f0756bd0d19359ae5':
  DO NOT MERGE Check malloc result to avoid NPD

Change-Id: If6409d50ffee537fa7a7caa93e2f9352e9ce54ad