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