resolved conflicts for 3b8747ca to lmp-mr1-ub-dev

Merge commit '3b8747ca' into HEAD

libstagefright: sanity check size before dereferencing pointer in Utils.cpp

Also remove some CHECK's.

Bug: 23680780
(cherry picked from commit 7bb772e0)

Change-Id: I5b919716178eb3ba844b21e497b792e6ac61554d