Android VTS 8.1 Release 11 (6166617)
Merge "Fix assignment of H264TrackImpl.timescale."
am: 967c1f2

* commit '967c1f29abc321c34306424534c8b57a033b18dc':
  Fix assignment of H264TrackImpl.timescale.