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

* commit '47bfaf57c2fe88b29a1d6e05dfc1fc35e7d08697':
  libstagefright: fix possible overflow in SampleTable.cpp