Merge "Split mocks/media/MockBitmaphandler file"