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

Change-Id: Ib0137cb13766e4b843d0cdf70d530f704a6c77f4