diff --git a/Android.mk b/Android.mk
new file mode 100644
index 000000000..e6b5a1923
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,49 @@
+# This is the Android makefile for libyuv so that we can
+# build it with the Android NDK.
+ifneq ($(TARGET_ARCH),x86)
+
+LOCAL_PATH := $(call my-dir)
+
+common_SRC_FILES := \
+    source/compare.cc \
+    source/convert.cc \
+    source/convert_from.cc \
+    source/cpu_id.cc \
+    source/format_conversion.cc \
+    source/planar_functions.cc \
+    source/rotate.cc \
+    source/row_common.cc \
+    source/row_posix.cc \
+    source/scale.cc \
+    source/scale_argb.cc \
+    source/video_common.cc
+# For Neon support, add .neon to all filenames and the following
+#    source/rotate_neon.cc
+#    source/row_neon.cc
+
+common_CFLAGS := -Wall -fexceptions
+
+common_C_INCLUDES = $(LOCAL_PATH)/include
+
+# For the device
+# =====================================================
+# Device static library
+
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+
+LOCAL_NDK_VERSION := 5
+LOCAL_SDK_VERSION := 9
+LOCAL_NDK_STL_VARIANT := stlport_static
+
+LOCAL_SRC_FILES := $(common_SRC_FILES)
+LOCAL_CFLAGS += $(common_CFLAGS)
+LOCAL_C_INCLUDES += $(common_C_INCLUDES)
+
+LOCAL_MODULE:= libyuv_static
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_STATIC_LIBRARY)
+
+endif
diff --git a/README.chromium b/README.chromium
index a7eca3d53..4f2a79237 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 364
+Version: 365
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 6314784db..c5b677fea 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 364
+#define LIBYUV_VERSION 365
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/public.mk b/public.mk
new file mode 100644
index 000000000..090d8cb65
--- /dev/null
+++ b/public.mk
@@ -0,0 +1,13 @@
+# This file contains all the common make variables which are useful for
+# anyone depending on this library.
+# Note that dependencies on NDK are not directly listed since NDK auto adds
+# them.
+
+LIBYUV_INCLUDES := $(LIBYUV_PATH)/include
+
+LIBYUV_C_FLAGS :=
+
+LIBYUV_CPP_FLAGS :=
+
+LIBYUV_LDLIBS :=
+LIBYUV_DEP_MODULES :=