remove some unused code
add timestamp in decoder
Merge pull request #1557 from dongzha/AddDecoderTimeStampNew

add timestamp in decoder
Merge pull request #1556 from ruil2/max2

remove some unused code
Merge remote-tracking branch 'upstream/master' into travis.android