Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb