am 3264b251: am 39ff8149: Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev

* commit '3264b251353c37d7efc8ffb6e420dd71b6b62349':
  libstagefright: fix possible overflow in SampleTable.cpp