Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev

        }

        c.drawColor(Color.TRANSPARENT, PorterDuff.Mode.SRC);

        mSurfaceControl.setPosition(0, 0);

        mOverlay.setBounds(0, 0, mScreenSize.x, mScreenSize.y);

        // Always draw the overlay with square dimensions

        int size = Math.max(mScreenSize.x, mScreenSize.y);

        mOverlay.setBounds(0, 0, size, size);

        mOverlay.draw(c);

        mSurface.unlockCanvasAndPost(c);

    }