Fix build warning.

Change-Id: I27d3066053a6fb45485f37d57c066375714cc3c1
Merge "Fix build warning."
am 170bf8ee: Merge "Fix build warning."

* commit '170bf8ee9a4f3df4515bd663def26cd721450012':
  Fix build warning.
Fix three harmony tests that failed on Android and the RI.

(cherry-pick of 0fa2848eccd0016198dc99df683c6ba0ff9b0caa.)

Bug: 7288264
Bug: 7307154
Change-Id: Idd1fd012606341bf0ae47840e9b5fd6e6fcd31b7
Fix three harmony tests that failed on Android and the RI.

(cherry-pick of 55b505d649b4babcc8420673050cac50c9c41c9c.)

Bug: 7288264
Bug: 7307154
Change-Id: I4cde772e8860b98cb01230c7628446a58cebc8c4
Merge "Fix three harmony tests that failed on Android and the RI."
am 7f15f176: Merge "Fix three harmony tests that failed on Android and the RI."

* commit '7f15f17659ebca0757ce1c7fa3ecd7e8fe074324':
  Fix three harmony tests that failed on Android and the RI.
am 10bd9f5e: am 7f15f176: Merge "Fix three harmony tests that failed on Android and the RI."

* commit '10bd9f5e40c6f0f7fd7ec805878632b8ae8d02df':
  Fix three harmony tests that failed on Android and the RI.
ICU 49.2 upgrade.

Change-Id: If9e86fa0f9f5fa30f3e6b1e4d18f997419e673ab
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1