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

Change-Id: I56e825a16d4a1bcec4e062ba0a866ad3de137436