Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread