Merge "Refactor JNI to remove ITimeFilter/IDemux/ITuner"