am c9553f2e: am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms...

am c9553f2e: am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into fro