Merge "Use utf-8 instead of default encoding in build_android_stubs.mk"