Fix IllegalArgumentException from Surface.release()

ag/9659388 introduced a problem where calling Surface.release() would
possibly result in an IllegalArgumentException. Fix the order of
deletions in release() to avoid this.

Bug: 144862317
Test: Ran a cts test that was failing with the exception, confirmed it
      no longer fails with this CL in place.

Change-Id: Ib3fa67d49457aee304512642afe34ed6a887e6eb