Merge "Fix IcuCompatTest#testMaximizeAndGetScript pre API 21." into nyc-mr1-dev