Merge "stagefright: add a 2kb cache for CallbackDataSource."