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