Merge "httplive: fix overflow in BandwidthEstimator" am: 6cc43e10f4
am: 3c0f1962af

Change-Id: Ifab0b1f9ef5cd46b7a6b66c9e2abd27b942875e9