Merge "Fix for ANDROID-19270126 for testAkkicateJavaPixelRefIntOverflow" into lollipop-cts-dev