Merge "Use utf-8 instead of default encoding in build_android_stubs.mk"
am: 656f329a74

Change-Id: Iab18503f265091188c35f8041899551b71ec025f