diff --git a/README.chromium b/README.chromium
index 6706a1ccb..326015044 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 115
+Version: 116
 License: BSD
 License File: LICENSE
 
diff --git a/source/convert.cc b/source/convert.cc
index a3bd10da3..d4e1cc319 100644
--- a/source/convert.cc
+++ b/source/convert.cc
@@ -977,6 +977,9 @@ int RAWToI420(const uint8* src_frame, int src_stride_frame,
 // Convert camera sample to I420 with cropping, rotation and vertical flip.
 // src_width is used for source stride computation
 // src_height is used to compute location of planes, and indicate inversion
+// TODO(fbarchard): sample_size should be used to ensure the low levels do
+// not read outside the buffer provided.  It is measured in bytes and is the
+// size of the frame.  With MJPEG it is the compressed size of the frame.
 int ConvertToI420(const uint8* sample, size_t sample_size,
                   uint8* y, int y_stride,
                   uint8* u, int u_stride,
diff --git a/source/rotate.cc b/source/rotate.cc
index 5ded3c703..0d66d9562 100644
--- a/source/rotate.cc
+++ b/source/rotate.cc
@@ -33,18 +33,17 @@ uvec8 kShuffleReverseUV = {
 #define DECLARE_FUNCTION(name)                                                 \
     ".text                                     \n"                             \
     ".globl _" #name "                         \n"                             \
+    ".private_extern _" #name "                \n"                             \
+    ".align 4,0x90                             \n"                             \
 "_" #name ":                                   \n"
 #else
 #define DECLARE_FUNCTION(name)                                                 \
     ".text                                     \n"                             \
-    ".global " #name "                         \n"                             \
+    ".align 4,0x90                             \n"                             \
 #name ":                                       \n"
 #endif
-
 #endif
 
-
-
 typedef void (*reverse_uv_func)(const uint8*, uint8*, uint8*, int);
 typedef void (*rotate_uv_wx8_func)(const uint8*, int,
                                    uint8*, int,
diff --git a/source/scale.cc b/source/scale.cc
index ff58a7a75..2a8e10709 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -526,15 +526,16 @@ static void ScaleRowDown38_2_Int_NEON(const uint8* src_ptr, int src_stride,
 #define DECLARE_FUNCTION(name)                                                 \
     ".text                                     \n"                             \
     ".globl _" #name "                         \n"                             \
+    ".private_extern _" #name "                \n"                             \
+    ".align 4,0x90                             \n"                             \
 "_" #name ":                                   \n"
 #else
 #define DECLARE_FUNCTION(name)                                                 \
     ".text                                     \n"                             \
-    ".global " #name "                         \n"                             \
+    ".align 4,0x90                             \n"                             \
 #name ":                                       \n"
 #endif
 
-
 // Offsets for source bytes 0 to 9
 extern "C" TALIGN16(const uint8, shuf0[16]) =
   { 0, 1, 3, 4, 5, 7, 8, 9, 128, 128, 128, 128, 128, 128, 128, 128 };