Merge "MediaPlayertest#testVideoSurfaceResetting : Change the Tolerance value back to original 150 msecs as that covers vast range of devices with varying audio latency range."