Merge "base: remove execute bit from utf8.h" am: 2a5881186d
am: 6580676183

Change-Id: I88b55607f0523c48e82ee75aa8974e5d8e654db4