Minor tweaks to merged pull requests.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=112161860

extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/OkHttpDataSource.java

@@ -22,6 +22,13 @@ import com.google.android.exoplayer.upstream.TransferListener;
 import com.google.android.exoplayer.util.Assertions;
 import com.google.android.exoplayer.util.Predicate;
 
+import okhttp3.CacheControl;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,13 +38,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
-import okhttp3.CacheControl;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
 /**
  * An {@link HttpDataSource} that delegates to Square's {@link OkHttpClient}.
  */

library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java

@@ -394,11 +394,11 @@ public final class TsExtractor implements Extractor {
             streamType = TS_STREAM_TYPE_H265;
           }
           break;
-        } else if (descriptorTag == 0x6a) {
+        } else if (descriptorTag == 0x6A) {
           streamType = TS_STREAM_TYPE_AC3;
-        } else if (descriptorTag == 0x7a) {
+        } else if (descriptorTag == 0x7A) {
           streamType = TS_STREAM_TYPE_E_AC3;
-        } else if (descriptorTag == 0x7b) {
+        } else if (descriptorTag == 0x7B) {
           // TODO: TS_STREAM_TYPE_DTS;
         }