Merge "Remove unused ICU4C headers in libartbase-art-gtest and libart-runtime-gtest" am: fcf213c382
am: 43056d2bda

Change-Id: I61f37c76904bc64d5c256b2b085e346fdd27963d