am 03b7f72b: (-s ours) am 9d916c77: DO NOT MERGE - libstagefright: sanity...
am 03b7f72b: (-s ours) am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '03b7f72b':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp