Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"

    const ISurface::BufferHeap& buffers(mBufferHeap);

    uint32_t w = mLayer.mTransformedBounds.width();

    uint32_t h = mLayer.mTransformedBounds.height();

    if (buffers.w * h != buffers.h * w) {

    if (mLayer.getOrientation() & (Transform::ROT_90 | Transform::ROT_270)) {

        int t = w; w = h; h = t;

    }