Merge "Only destroy remote graphic buffers Bug #9795157"

                        if (map != null) {

                            GLES20Canvas.initAtlas(buffer, map);

                        }

                        // If IAssetAtlas is not the same class as the IBinder

                        // we are using a remote service and we can safely

                        // destroy the graphic buffer

                        if (atlas.getClass() != binder.getClass()) {

                            buffer.destroy();

                        }

                    }

                }

            } catch (RemoteException e) {

                Log.w(LOG_TAG, "Could not acquire atlas", e);

            }