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

* commit '39ff8149466ee8e86c0336f706cd4dd3713f359f':
  libstagefright: fix possible overflow in SampleTable.cpp