Merge Conflict Fix CL to lmp-mr1-release for ag/849478

DO NOT MERGE - libvpx: Pull from upstream

Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06

BUG=23452792

Change-Id: Ic78176fc369e0bacc71d423e0e2e6075d004aaec

 virtual void EndPassHook(void) {
 for (int layer = 0; layer < static_cast<int>(cfg_.ts_number_layers);
 ++layer) {
      duration_ = (last_pts_ + 1) * timebase_;
 if (bits_total_[layer]) {
        effective_datarate_[layer] = (bits_total_[layer] / 1000.0) / duration_;
 }
 }
 }

 virtual void EndPassHook(void) {
 for (int layer = 0; layer < static_cast<int>(cfg_.ts_number_layers);
 ++layer) {
      duration_ = (last_pts_ + 1) * timebase_;
 if (bits_total_[layer]) {
        effective_datarate_[layer] = (bits_total_[layer] / 1000.0) / duration_;
 }
 }
 }
