Merge \"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\" into mnc-dev
am: 77effe4be6

Change-Id: I2c37ed8a51cca75b9264a9cc66c0453e17154f79