Merge changes I3b93c2b8,Ia8e83727 into nyc-dev
am: 00803f7e94

* commit '00803f7e94052144ecf476268bc717191ee29865':
  stagefright: Remove unused ClockEstimator and TimeSource
  stagefright: Remove unused TimedTextDriver and Sources