Merge "Don't reset static sp<TunerClient> JTuner::mTunerClient in ~JTuner()"