Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1