Restore "Merge downstream branch 'developers-dev' into 'klp-dev'"

This reverts commit ec985147ec781dfff9a229c6b794ee4eac0ced91.
diff --git a/media/BasicMediaDecoder/settings.gradle b/media/BasicMediaDecoder/settings.gradle
new file mode 100644
index 0000000..1e76e09
--- /dev/null
+++ b/media/BasicMediaDecoder/settings.gradle
@@ -0,0 +1,4 @@
+
+
+
+include 'BasicMediaDecoderSample'