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

Change-Id: Ie55158830000dc167a6b3dae06ef87ee56fa5190