am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo

Merge commit 'bbc6e33b1f7fff3280c3fa44836833f4bab4bf99' into froyo-plus-aosp

* commit 'bbc6e33b1f7fff3280c3fa44836833f4bab4bf99':
  Adds back the finalize method on the replaced Paint class.